Some declarations are not needed - removing