Clean up imports
Get rid of old instrument fragment layout