Improve require statements

- Remove unnecessary require statements
- Simplify require statements