Cleanup & a good round of tech debt reduction