Removed uneccesary stuff