cleanup, ready to test gitflow on maestrodev