Some code cleanup in resolving functions
Temporarily comment print functions for clearer output