fixing FL-1406 and removing older rc builds