clean up things, use local