Removed useless code and coversall added