cleanup, pre-refactor commit
cleanup, refactor for user friendliness
removing dependencies on mpsim