Removing old java in preparation for android base code