Cleaned up code. Removed souts and unused classes/methods/variables
Merge origin/master