android l modifications
some cleanup