cleanup of redundant/obsolete code