Yet some cleanup again