clean up deprecated functions, help improvements