remove unused code
update with latest changes