Removed unnecessary files & methods and code cleanup