Fix for DBAL-209
Fixed documentation.
Removed return statements on void methods.
Cleaned up unused private / local variables.