Cleanup, moving dependencies into Jacc