Cleanup: removed dupes & unused