removed demos, decreased compile time