Removed own logging code. Will contimplate other alternatives