Removed some stuff that was causing problems