removed fixed FIXMEs
fixing FIXMEs, move up STAGE_ADD_STATIC_ROUTES