Removed unused packages and updated headers