Deletion on server now manages rank, Ticket0377
reorganization and clean up, Ticket0377