Remove legacy pieces to new file