Remove the hack for keeping class at link time