Removed a chunk of redundant code