Fixed #98, cleaned up old