Rename and lose some unneeded stuff