Code clean up + possible ic2 collision