Start of clean-up of basecore2d.