Double quotes to singles. Removal of unused.