Remove other unused stuff