First pass at removing the mappingsupport files