Further cleanup for setup board