some minor code cleanup of unused functions