Removed obsolete code
More pruning of the starter-kit code
Fix for discover-mode