Cleanup: remove unused readonly elements