Removed unrelated code that should be in a dedicated library