code cleanup

cleaned up some remnant code fragements