minor changes

Unnecessary constatns deleted, minor bug with access to slaves from
DataSource fixed