Cleaned up code that was commented out