Removed some stuff that wasn't necessary.