remove signal/slot mechanism
major refactor