cleanup code - prep composer