Removing imports to fix duplicate class definition errors