cleaning up: removed DataHandler - not needed anymore