Removing unwanted constructor param and little fixes