Remove static in preparation for submodule