Removed unused contexts and updated views