Temp commit for branch switch
Cleaning things up to make debugging easier
Deleting/untracking useless files
Importing a database from res/
Code cleanup: removed lots of redundant code/unused code