get rid of unused code
add legacy resolve tests for built-in stuff