got rid of more unnecessary stuff