Deleted  more unneeded stuff