Removed some stuff I am no linger using