Fixed pass to use new approach for resolving limits
Removed smartpointer references from code. Starting to fix all the tests.