Deletion and Code Cleanup