Removed some traces