Push new code, needs cleanup