Submodule cleanup, CtrlP fr and ff macros