Temporary code is removed