keep template dir
cleanup develop branch