remove junk
more q_enums
workaround xware lie about completion time