Remove issues fixed hopefully