removed annoying things