Removed two useless #define
Added a timeguard to prevent intensive triggering