Remove buildtime dependency from runtime classes