delete obsolete stuff which occured after merging #69