Cleaned up debug 'puts' and code that was commented out.