adjusted composer file and clean-up