Revert "minor clean up ready for interview"

This reverts commit fc0e10df4e87cfacd448dcfb974587780e4ab6f5.
attempted intergration of icon picker.