Fix android project, Remove old unused code