Remove callbacks and keep it simple for now