Simplify setup
Remove Fluff