Feature/removing warnings