Cleaned up image locations