Remove unnecessary class
Refactor stuff, remove unnecessary files