added java and remove some instance stuff