config changes
removed useless code
final version