Remove deprecated files and minor fixes to app to prepare to hook into limelight common