Alright - we should remove them from the skeleton as well at some point