Remove redundant code, fix bugs, and improve efficiency#32

sambles merged 2 commits intodevelopOasisLMF/OasisDataManager:developfrom

clean-upOasisLMF/OasisDataManager:clean-upCopy head branch name to clipboard