fix issue #1
More cleanup.\n\nWe're sure getting clean :)