Remove orphaned include, fix specs