Updates and cleanup