And remove logging statements :)