Cleanup comments and unused resources