Cleanup Config and fix rotation