Cleanup on rendertask. Removed scenario package.