Revert "Added changes to core and plugin files"

This reverts commit 50d79ecb251037e1d1a5eb2243825c828b5833fd.