#418 code format
#418 Removed obsolete code
#418 set Di to dev to prevent issues while developing