removed some outside logging and stuff