Update SQL cleanup commands for new schema