Cleanup and reverting ->getContent to parent::getContent