clean up of unnesseasy helper functions