Cleanup work & Composer