Clean up old modules

Change-Id: I8e565622d37639834cf70d431891e86a74a5d5d7