Cleanup & Set Java requirement to java 6