clean up & openjdk-7 for aurora testing