Removing legacy, unused code