Removed logging, OOPS