removed conflicting calls