removed annoying stuff