cleaned up commented out pieces