Deleting that awful code...