Yes ,remove stock and clean everthing, soaking stock to remove oil can cause wood shrinkage so go slow