PSR compliance, removed demo bundle.