Removed unwanted files. Added log statements and minor improvements