cleanup + merge breandan