Removing useless dependencies
CS fixes (EOF EOL)