removed out commented stuff