1. remove noused files 2. small adjust