Cleaned up some files. Removed redundant code.