Refactor to Baseline
Remove useless stuff