some code cleanup, todo removal, bumped target version