Gut the .java

Removed existing code so that I could refactor it