updated conf and deleted some stuff