Finalisation of own technical cleanup