Remove unused functions. More layout testing.