remove old code, a bit of clean up