change to aokpftw and cleanup