Clean up

- Remove unused methods