Remove unnecessary clicks