-removed some no more used shit