Updated conf and removed unnecessary code