Remove contextify dependency