Removed commented stuff