cleanup

remove no longer required methods, use adapters for listeners