Removing contextify dependency