Cleaned-up core
Clean up to have travis back online