removed commented stuff