cleaned up some duplicate classes that were causing trouble