Remove log. Fix some keys