code cleanup removing old crap