additional fixes and changes
removed unnessessary files