Cleanup misc unneeded things