removed more code which is currently unused