cleanup + features complete