HAMA-765: remove useless classes