Cleanup/fewer dev dependencies