updated Cleanup to remove from prefixtable as well