Removed stuff from java.
Simplified property-file.