code refactoring and cleanup of unwanted of files