Cleanup, removed unused code.