Refactored according to latest comments
Removed file that shouldn't be tracked by git