Removed redundant library calls