general code clean up, removed things that no longer exist etc