Time to get rid of splash stuff