updates to rm and cleanup based on the tinkering with the board