method cleanup for first public version