Code clean up. Functions no required were removed.