Cleaned up a bit. did not need two map java and xml files