some warnings cleaned