Added null macro, deleted unnecessary files