removed stuff from functions