Got rid of unused libraries and added comments