Removed commented old code. Fixed instrument check