FIXED #26. Removed the last remnants of Warbler