Move subclassed 2007 and 2010 objects into one file
Remove unused import