Style
Start stipping out old functionality.