cleaning up code now that we have a working extension