#18 Removing unneeded library