Clean up require logic