BUGFIX: Clean up YML