removed some uneccecery stuff