additional code cleanup for jack android