code cleanup
removing duplicate file
merging