Removed temporary implementations.