HAMA-681: remove useless classes