code cleanup; implement model deletion (naive)