Refactored delete organization code such that deletion code is located in services layer