fixes for database store remove