Further updates to remove unused functionality