Few unused bits n bobs

completed