Removed unneccesssary things