Remove unnecessary stuff
Another step forward