fix generation order of statics again
cleanup dependencies (first run)