Cleaning up; compiles except for databind deps from core (which need to be eliminated)