deleted remaining code