Removed some redundant stuff that broke.