remove the optional functionality so we can add it as a plugin