Need to clean some stuff up.