Removed unneccessary commented stuff