deleted some bugs