Removed dirty code form flat identifier