Cleanups

Signed-off-by: task650 <task650@gmail.com>
Merge branch 'task650' into cm-10.1