removed commented / unneeded code