begin removing unnecessary pieces and renaming