Removing useless packages & cleanup