Clean up axis and switches interaction