Finally got rid of everything