Pull out excess for minimal demo