removing some callback shit