removed Statement struct