Removed manual connection feature

Also did some javadoc.