Rich D: removed unused code/files