Android fixes and removal of unneeded elements