Removed some other stuff