Remove old scaffold stuff