Clean up D&D stuff