starting to clean up component discovery