cleanup some shortcuts