Removed shortcut functions