Removed gittu-dustami and little refactoring