cleanup to remove unused subroutines