removed un-used lib and code