removes unused code; code cleanup