remove some uneeded some and general cleanup