sim refactor cleanup