removing dead code, code cleanup