Deleted some stuff that was commented out