Cleanup some code and remove unneeded textviews