Removed unncessary stuff