Images Cleanup

Pfiuu~ That was some work