Cleaned up ubertool_pop submodule