Remove extra usage of Buffer