Remova some of trash and several additions