remove unused file
Make some code more readable