Merge branch 'enhancement/cleanup' into 'master'

Cleaned up deprecated code

See merge request !19
5 jobs for master in 12 minutes and 43 seconds (queued for 2 seconds)