Code Cleanup

Clean up unneeded files/code.