clean up some duplicated classes that were causing issues