Keep home clean

This one need some commits before merging