Cleanup specs
Remove lazy require