Removeed log call, cleaned up unused