Clean-up commented out code
Split Friday/Saturday on schedule