Removing old (now refactored) code