clean up some depreciated methods