Got rid of UIImage categories

Redundancy is stupid