Removed unneeded functions.
Small code tweaking.
Remove TODO that is now done.
More work on this room.