Clean up require statements