Cleanup, removed unused code