Cleanup + commented out callbacks for now. It's not finished yet and won't be in this iteration