Fix RTC #302944 and r303920

Cleanup ignores and remove generated files