Went through the todo list. Removed some functions. Others are not used but are just taking up space. Commented some out.