Cleaning several classes to start testing some new features