Splash cleanup.... kind of