Satisify lint, remove unused