Removed scaffold code