Imported load of java code and removed some spring references from it