Removed excess stuff