cleanup; removing old function