Rip out problematic, unused nice-to-have; #1020