- Remove currently unused functionality