Slim stuff and cleanup

Change-Id: Ib4ffdb06ba19ed4772537e62803d8cdc4e8af404