Oops, left some unclean code there