Add missing source and remove some debugging lines