more cleanup in the core section.

Change-Id: I2a7b457b7634cc5d27b3a55eeeb0087f1096c836
Signed-off-by: Jacques Bouthillier <lmcbout@gmail.com>
7 files changed