Removed redundant setup code