Removing callback; Fixes #3