Fixed removing bug.
Changes to the Effect timer