removed unnecessary stuff
uncommented a branch