Clean up some old cruft from jb era

Change-Id: I8e1fd3668ae7f99c917824b2736118f9c82d212c
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>