Removed demo-static