remove unnecessary source folder
fix key weirdness