Skip to content

Further clean up

Further clean up #40