Removing Essentials and WhatIsIt dependencies