Why were this moved into this file?