Remove more 'require' statements and clean-ups