Remove commented out custom windows from includes