cleaned up some unused functions/aliases