just some remarks and removal of unused stuff