Cleanup and added stock x10 config