Cleaned up some unneeded copy 'n paste