Remove gen code, left static only