Code cleanup
Removed unneeded action items and code, fixed a few method names to better match the conventions of related methods, and fix the picker breadcrumb