skeleton: cleaning up