Removed activation and decativation calls