Removed unneccessary things and added neccessary things.