More cleanup + create box script