Last cleanup & API lockup