[CLS] Cleans up the code from the properties dependencies.