Remove unused actions
Clean code