Functions Removed and Added to Core Plugin

Functions not really relevant and in the right place where removed to
the core plugin.