Completed some TODO Tasks

Change-Id: I96e7a9f19a00142429df7632ab38bec03044611a