Cleaned up stuff from 3396e476c0133a10e75cafb0e54a1c63a9af30ff