Removed some stuff that was commented out for testing purposes.