Updating coverage, removing useless code