Remove old SAPI folder and remove excess files