took out unnecessary things