Cleaning up for skeleton