Remove statics
Update and add new submodule