removed some sh*t