Removed unnecessary stuff from the master branch