Add remove method to the ObjectStore and refactor a bit

This method will be used for deleting labels