Removed special context for startup and improved build