Removed unused contexts and controllers