Fix apply running twice
Fix remove event listners bug