Deleted unused packages, added comments