delete and fixes