Cleaned up code

Deleted unuser files, removed unused lines, etc. General cleaning up of
code.