cleanup. got rid of useless things