Refactor and clean code
Remove unneeded file