Removed $context from short codes