Remove unnecessary code. Version 2.0