Removed makros from worker.*