major cleanup of paradise builds