Removed some shortcut functions