Removed some un useful code