Removing commented out code, removing redundant Jetty dependencies