remove obsolete code
cleanup and cosmetics