remove invalid and not used functionality
remove invalid and not used functionality