Start carving out the code no longer needed