Cleanup, remove dead code