Removed some stuff that should have been ignored