Cleaned up the scaffold