Remove unneeded logic in constructor