Some clean up after refactor