removed some stuff I won't use