Fix warnings
Remove orphan dependencies