Removing redundant skeleton code