cleanup undeclared functions #133