Remove debug; prob. final version