Cleaning up codes.
Deleted unused classes and interfaces.
Merge branch '20140801_ResolvingCodeIssues' into developement