Update and clean ups