removing unused code, clean-up