Removed callSuper