removed unnecessary stuff resulting from last commit