Cleanup commented & orphaned leftovers