Removed silly bugs