Fix error messages at startup

Change-Id: I0378bf82cdd1209de0f53df1c40a6c41b6f9b109
These files no more exist

Change-Id: I979164e8ef1368b07b41d149522359b3ded04491
Update with deleted/new files

Change-Id: I6495f4c338665c7644aa4f264abd45cc62b532f7