removed some un wanted code