Delete extra files and fix favorites

@cbeck - hey merge this