Litle: Cleanup and remove remnants