Removed unneccessary things