Removed unnecessary methods and moved logic around to avoid coupling core to portlets