cleanup & updates