Remove ugly callback hack