Removed unecessary stuff