Remove some require statements
Source modularized