Cleanup old code

Created by  Henrik Tjäder  on July 11, 2020
ZJUC65PX5MUE2YQZGFHBSHJYLJRAUAII3FIUFABO4KB6G3KGPENQC
Change contents