Clean up, bugfix log + debug behavior, removed trash
clean up