Remove typesafety