Removing OptionalType.java from src/main/java

Removing OptionalType.java from src/main/java. Its added now to
src/test/java