Removed more java 7 codes, because mcp doesn't compile them