removing all of this from the main branch