Removed unnecessary packages and variables