Remove __construct