Remove context stuff

Helps #26