CFY-1419 move things around and remove flowdock notification