clean up, fix warnings