new organisation, removing unused code