Remove needless construct
More cleanup