cleanup for new pagoda pattern