Made jnServerFile more dynamic, cleanup again