removed unnecessary packages and references. Minor bug fixes