Cleanded out changes