Clean stuff + create baseline for easy loading