Core: Clean up last commits