removed un-wanted code