Code Changes (20130103-A)

1 - Code refactoring and code clean up
2 - Removed a lot of code crud