Cleaned up commented and debug code