Improving config and remove unused gems