Removed some probably unnecessary stuff